Undo the unintended changes to vm86.c that came in through the last merge.

diff --git a/tools/firmware/vmxassist/vm86.c b/tools/firmware/vmxassist/vm86.c
index 03c44bb0346bb7c3355b2b6ca7df278bdee98dd2..e3fcaa52762b0b4ee41b6fe2ea4248a89b42be40 100644 (file)
--- a/tools/firmware/vmxassist/vm86.c
+++ b/tools/firmware/vmxassist/vm86.c
@@ -38,7 +38,7 @@ unsigned prev_eip = 0;
 enum vm86_mode mode;
 
 #ifdef DEBUG
-int traceset = 0xff;
+int traceset = 0;
 
 char *states[] = {
        "<VM86_REAL>",
@@ -446,8 +446,6 @@ movcr(struct regs *regs, unsigned prefix, unsigned opc)
 #endif
                        if (getreg(regs, modrm) & CR0_PE)
                                set_mode(regs, VM86_REAL_TO_PROTECTED);
-                        else
-                               set_mode(regs, VM86_REAL);
 
                        break;
                case 3:
@@ -605,9 +603,7 @@ set_mode(struct regs *regs, enum vm86_mode newmode)
 {
        switch (newmode) {
        case VM86_REAL:
-               if ((mode == VM86_PROTECTED_TO_REAL) ||
-                    (mode == VM86_REAL_TO_PROTECTED)) {
-                       regs->eflags &= ~EFLAGS_TF;
+               if (mode == VM86_PROTECTED_TO_REAL) {
                        real_mode(regs);
                        break;
                } else if (mode == VM86_REAL) {